Auto merge of #1616 - sbeckeriv:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 17 May 2015 20:30:03 +0000 (20:30 +0000)
committerbors <bors@rust-lang.org>
Sun, 17 May 2015 20:30:03 +0000 (20:30 +0000)
This resolves #1379

1  2 
src/cargo/util/toml.rs
tests/test_cargo_compile.rs

Simple merge
Simple merge